Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Cargo.lock automatically adding message #58157

Merged
merged 1 commit into from
Feb 11, 2019
Merged

Add Cargo.lock automatically adding message #58157

merged 1 commit into from
Feb 11, 2019

Conversation

h-michael
Copy link
Contributor

If I execute cargo +nightly fix, this change always occurs; cc #58099
r? @Centril

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 4, 2019
@taiki-e
Copy link
Member

taiki-e commented Feb 4, 2019

cargo +nightly fix automatically do commit up? Otherwise, you should be able to exclude Cargo.lock before you commit your changes.

Also, if you execute python x.py test etc, similar messages should be added to Cargo.lock.

@h-michael
Copy link
Contributor Author

cargo +nightly fix automatically do commit up? Otherwise, you should be able to exclude Cargo.lock before you commit your changes.

Yes, I can exclude Cargo.lock before commit.
But I get this change in everytime. That bothers me :(.

@Centril
Copy link
Contributor

Centril commented Feb 6, 2019

r? @alexcrichton

@rust-highfive rust-highfive assigned alexcrichton and unassigned Centril Feb 6, 2019
@ehuss
Copy link
Contributor

ehuss commented Feb 6, 2019

fwiw, this needs to be done eventually (once stage0 is 1.34), and it should be safe to do now. Stable Cargo preserves the comment.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Feb 7, 2019

📌 Commit bd4df0c has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 7, 2019
kennytm added a commit to kennytm/rust that referenced this pull request Feb 8, 2019
Add Cargo.lock automatically adding message

If I execute `cargo +nightly fix`, this change always occurs; cc rust-lang#58099
r? @Centril
pietroalbini added a commit to pietroalbini/rust that referenced this pull request Feb 10, 2019
Add Cargo.lock automatically adding message

If I execute `cargo +nightly fix`, this change always occurs; cc rust-lang#58099
r? @Centril
@RalfJung
Copy link
Member

@bors rollup

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Feb 10, 2019
Add Cargo.lock automatically adding message

If I execute `cargo +nightly fix`, this change always occurs; cc rust-lang#58099
r? @Centril
bors added a commit that referenced this pull request Feb 10, 2019
Rollup of 16 pull requests

Successful merges:

 - #57259 (Update reference of rlibc crate to compiler-builtins crate)
 - #57740 (Use `to_ne_bytes` for converting IPv4Addr to octets)
 - #57926 (Tiny expansion to docs for `core::convert`.)
 - #58157 (Add Cargo.lock automatically adding message)
 - #58203 (rustdoc: display sugared return types for async functions)
 - #58243 (Add trait alias support in rustdoc)
 - #58262 (Add #[must_use] message to Fn* traits)
 - #58295 (std::sys::unix::stdio: explain why we do into_raw)
 - #58297 (Cleanup JS a bit)
 - #58317 (Some writing improvement, conciseness of intro)
 - #58324 (miri: give non-generic functions a stable address)
 - #58332 (operand-to-place copies should never be overlapping)
 - #58345 (When there are multiple filenames, print what got interpreted as filenames)
 - #58346 (rpath computation: explain why we pop())
 - #58350 (Fix failing tidy (line endings on Windows))
 - #58352 (miri value visitor: use `?` in macro)

Failed merges:

r? @ghost
@bors bors merged commit bd4df0c into rust-lang:master Feb 11, 2019
@h-michael h-michael deleted the cargo-lock branch February 11, 2019 01:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants